Depend on gtk.ico.

2002-02-16  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.

	* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
	Simoncic for providing the nice multi-resolution .ico file.

diff --git a/ChangeLog b/ChangeLog
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0bd53ae2f6121058ab0704bb043b7bb79d04316c..81b265213d7829f41b920c8d4a0abd322f370289 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-02-16  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
+
+       * gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
+       Simoncic for providing the nice multi-resolution .ico file.
+
 2002-02-15            Alexey Malyshev       <maa@sparc.spb.su>
         * gtk/tmpl/gtkimage.sgml
        removed wrong sentence from gtk_image_new() docs

diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am
index 7144183fd4d52588db98aa1d78854f7a3b256226..707eee3dae5f6be4fd5cd67d65845d3345e0c5b7 100644 (file)
--- a/gdk/win32/rc/Makefile.am
+++ b/gdk/win32/rc/Makefile.am
@@ -7,5 +7,5 @@ if USE_WIN32
 noinst_DATA = gdk-win32res.lo
 endif
 
-gdk-win32res.lo : gdk.rc
+gdk-win32res.lo : gdk.rc gtk.ico
        $(top_srcdir)/build/win32/lt-compile-resource gdk.rc gdk-win32res.lo

diff --git a/gdk/win32/rc/gtk.ico b/gdk/win32/rc/gtk.ico
index 54ee412e9a4a2e62e40d3fc3bd3568b93c15ab15..5e13f952e83be43c9bacc9b875cb2edb46d01661 100644 (file)
Binary files a/gdk/win32/rc/gtk.ico and b/gdk/win32/rc/gtk.ico differ